Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 00:05:57 +0000 (17:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 00:05:57 +0000 (17:05 -0700)

Trivial merge